Rename GTK_ICON_LOOKUP_LOAD_IN_THREAD to GTK_ICON_LOOKUP_PRELOAD

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index a18316ec046b2796c4027b15c2ef25fe6095a7a9..9b68d498311a07238fc573c963797772c7c95464 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -99,7 +99,7 @@ ensure_paintable_for_gicon (GtkIconHelper    *self,
   icon_theme = gtk_css_icon_theme_value_get_icon_theme (style->core->icon_theme);
   flags = get_icon_lookup_flags (self, style);
   if (preload)
-    flags |= GTK_ICON_LOOKUP_LOAD_IN_THREAD;
+    flags |= GTK_ICON_LOOKUP_PRELOAD;
 
   width = height = gtk_icon_helper_get_size (self);
 

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 6dbbff8e4296a37c7c763a797842373b13b3e877..0232396f19ef69f8ad2d0857ba914eac193436f5 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2272,7 +2272,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme       *self,
 
   gtk_icon_theme_unlock (self);
 
-  if (flags & GTK_ICON_LOOKUP_LOAD_IN_THREAD)
+  if (flags & GTK_ICON_LOOKUP_PRELOAD)
     {
       gboolean has_texture = FALSE;
 

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index f0fc704ed4001da06ac61583ee112bc7da8bfd55..f2904708f100afd755ce138f5452bdc7b421c9b6 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -44,16 +44,16 @@ typedef struct _GtkIconTheme      GtkIconTheme;
  *   when symbolic icon names are given
  * @GTK_ICON_LOOKUP_FORCE_SYMBOLIC: Try to always load symbolic icons, even
  *   when regular icon names are given
- * @GTK_ICON_LOOKUP_LOAD_IN_THREAD: Starts loading the texture in the background
+ * @GTK_ICON_LOOKUP_PREALOAD: Starts loading the texture in the background
  *   so it is ready when later needed.
  *
  * Used to specify options for gtk_icon_theme_lookup_icon()
  */
 typedef enum
 {
-  GTK_ICON_LOOKUP_FORCE_REGULAR    = 1 << 0,
-  GTK_ICON_LOOKUP_FORCE_SYMBOLIC   = 1 << 1,
-  GTK_ICON_LOOKUP_LOAD_IN_THREAD   = 1 << 2,
+  GTK_ICON_LOOKUP_FORCE_REGULAR  = 1 << 0,
+  GTK_ICON_LOOKUP_FORCE_SYMBOLIC = 1 << 1,
+  GTK_ICON_LOOKUP_PRELOAD        = 1 << 2,
 } GtkIconLookupFlags;
 
 /**